merge from trunk

author Joakim Verona <joakim@verona.se>

Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)

committer Joakim Verona <joakim@verona.se>

Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)
author Joakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)
committer Joakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)
committer	Joakim Verona <joakim@verona.se>
	Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history